test: Modify await_operator to dinamically get deployment name from csv when OLM is true by fjglira · Pull Request #1874 · istio-ecosystem/sail-operator

fjglira · 2026-04-23T14:10:27Z

If the bundle name is different from the sail operator, and OLM is set to true in the test, we got failures because await_operator never finds a sail-operator deployment in the namespace

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Related Issue/PR #

Additional information:

…sv when OLM is true If bundle name is different to sail operator and OLM is set to true in the test we got failures because await_operator never find a sail-operator deployment in the namespace Signed-off-by: Francisco Herrera <fjglira@gmail.com>

Copilot

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Updates the e2e operator integration suite to correctly await the operator Deployment when running in OLM mode by deriving the Deployment name from the installed CSV instead of assuming a fixed deployment name.

Changes:

Switch await_operator to resolve the operator Deployment name from the CSV when OLM=true
Improve logging to reflect that the awaited deployment may vary in OLM mode

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

codecov · 2026-04-23T14:34:35Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 80.48%. Comparing base (fe232ca) to head (0520c90).
⚠️ Report is 4 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1874      +/-   ##
==========================================
+ Coverage   73.88%   80.48%   +6.60%     
==========================================
  Files          51       51              
  Lines        3224     2598     -626     
==========================================
- Hits         2382     2091     -291     
+ Misses        719      383     -336     
- Partials      123      124       +1

Flag	Coverage Δ
integration-tests	`71.16% <ø> (-0.18%)`	⬇️
unit-tests	`52.30% <ø> (+1.09%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

FilipB

Maybe it would be easier to parse the ClusterServiceVersion file directly in the repo instead of getting it dynamically from the cluster? There might be other CSV which will break this approach

… in the manifest/bundle folder Changes from review Signed-off-by: Francisco Herrera <fjglira@gmail.com>

fjglira · 2026-04-23T16:19:58Z

/retest

fjglira · 2026-04-23T16:21:43Z

Maybe it would be easier to parse the ClusterServiceVersion file directly in the repo instead of getting it dynamically from the cluster? There might be other CSV which will break this approach

Did some change to get the name from the file in the bundle folder

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

istio-testing · 2026-04-24T11:38:25Z

In response to a cherrypick label: new pull request created: #1877

istio-testing · 2026-04-24T11:39:03Z

In response to a cherrypick label: new pull request created: #1878

istio-testing · 2026-04-24T11:39:39Z

In response to a cherrypick label: new pull request created: #1879

istio-testing · 2026-04-24T11:40:14Z

In response to a cherrypick label: #1874 failed to apply on top of branch "release-1.0":

Applying: test: Modify await_operator to dinamically get deployment name from csv when OLM is true
Using index info to reconstruct a base tree...
M	tests/e2e/common-operator-integ-suite.sh
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/common-operator-integ-suite.sh
CONFLICT (content): Merge conflict in tests/e2e/common-operator-integ-suite.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 test: Modify await_operator to dinamically get deployment name from csv when OLM is true

istio-testing · 2026-04-24T11:40:16Z

In response to a cherrypick label: new issue created for failed cherrypick: #1880

istio-testing · 2026-04-24T11:40:53Z

In response to a cherrypick label: new pull request created: #1881

* upstream/main: (35 commits) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1886) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1884) Fixing two problems with our hack/update-istio.sh script (istio-ecosystem#1882) test: Modify await_operator to dinamically get deployment name from csv when OLM is true (istio-ecosystem#1874) Update update-deps flow with 1.30 and remove 1.27 branch (istio-ecosystem#1875) tests: Skip TLS profile change test when is executed on Hosted clusters (istio-ecosystem#1873) Add 1.30.0-alpha.2 charts (istio-ecosystem#1854) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1872) Using crane instead of skopeo which is not available in the build-tools (istio-ecosystem#1870) Sync min tls version from `TLSConfig` to `Istio` (istio-ecosystem#1859) Fix serves metrics securely test (istio-ecosystem#1860) refactor: vendor kubernetes manifests into the repo (istio-ecosystem#1853) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1856) Modify "download-charts" script for alpha/beta releases (istio-ecosystem#1852) Add operator `TLSConfig` and sync with APIServer TLS profile on openshift (istio-ecosystem#1513) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1851) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1850) Add documentation for resource customization (istio-ecosystem#1292) refactor error and status condition handling (istio-ecosystem#1807) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1848) ...

* upstream/main: (39 commits) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1896) Fix test docs test failure (istio-ecosystem#1890) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1892) Skip processing aliases referencing pre-released versions in EOL updater (istio-ecosystem#1883) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1886) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1884) Fixing two problems with our hack/update-istio.sh script (istio-ecosystem#1882) test: Modify await_operator to dinamically get deployment name from csv when OLM is true (istio-ecosystem#1874) Update update-deps flow with 1.30 and remove 1.27 branch (istio-ecosystem#1875) tests: Skip TLS profile change test when is executed on Hosted clusters (istio-ecosystem#1873) Add 1.30.0-alpha.2 charts (istio-ecosystem#1854) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1872) Using crane instead of skopeo which is not available in the build-tools (istio-ecosystem#1870) Sync min tls version from `TLSConfig` to `Istio` (istio-ecosystem#1859) Fix serves metrics securely test (istio-ecosystem#1860) refactor: vendor kubernetes manifests into the repo (istio-ecosystem#1853) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1856) Modify "download-charts" script for alpha/beta releases (istio-ecosystem#1852) Add operator `TLSConfig` and sync with APIServer TLS profile on openshift (istio-ecosystem#1513) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1851) ...

* upstream/main: (41 commits) fix: handle repos with different release branch naming in crd-schema-checker (istio-ecosystem#1897) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1899) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1896) Fix test docs test failure (istio-ecosystem#1890) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1892) Skip processing aliases referencing pre-released versions in EOL updater (istio-ecosystem#1883) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1886) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1884) Fixing two problems with our hack/update-istio.sh script (istio-ecosystem#1882) test: Modify await_operator to dinamically get deployment name from csv when OLM is true (istio-ecosystem#1874) Update update-deps flow with 1.30 and remove 1.27 branch (istio-ecosystem#1875) tests: Skip TLS profile change test when is executed on Hosted clusters (istio-ecosystem#1873) Add 1.30.0-alpha.2 charts (istio-ecosystem#1854) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1872) Using crane instead of skopeo which is not available in the build-tools (istio-ecosystem#1870) Sync min tls version from `TLSConfig` to `Istio` (istio-ecosystem#1859) Fix serves metrics securely test (istio-ecosystem#1860) refactor: vendor kubernetes manifests into the repo (istio-ecosystem#1853) Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1856) Modify "download-charts" script for alpha/beta releases (istio-ecosystem#1852) ...

* test: Modify await_operator to dinamically get deployment name from csv when OLM is true (#1874) * test: Modify await_operator to dinamically get deployment name from csv when OLM is true If bundle name is different to sail operator and OLM is set to true in the test we got failures because await_operator never find a sail-operator deployment in the namespace Signed-off-by: Francisco Herrera <fjglira@gmail.com> * Get the deployment name from current .clusterserviceversion.yaml file in the manifest/bundle folder Changes from review Signed-off-by: Francisco Herrera <fjglira@gmail.com> --------- Signed-off-by: Francisco Herrera <fjglira@gmail.com> * Set DEPLOYMENT_NAME to csv name when OLM is true (#1918) This will avoid issues on the test while waiting for operator because will set DEPLOYMENT_NAME to the csv name used into fork test Signed-off-by: Francisco Herrera <fjglira@gmail.com> --------- Signed-off-by: Francisco Herrera <fjglira@gmail.com>

fjglira requested a review from a team as a code owner April 23, 2026 14:10

istio-testing added the size/S label Apr 23, 2026

fjglira added cherrypick/release-1.0 cherrypick/release-1.27 cherrypick/release-1.28 cherrypick/release-1.29 cherrypick/release-1.26 and removed size/S labels Apr 23, 2026

fjglira requested a review from Copilot April 23, 2026 14:21

Copilot AI reviewed Apr 23, 2026

View reviewed changes

Comment thread tests/e2e/common-operator-integ-suite.sh Outdated

Comment thread tests/e2e/common-operator-integ-suite.sh

Comment thread tests/e2e/common-operator-integ-suite.sh

FilipB reviewed Apr 23, 2026

View reviewed changes

Copilot started reviewing on behalf of fjglira April 23, 2026 14:55 View session

Get the deployment name from current .clusterserviceversion.yaml file…

0520c90

… in the manifest/bundle folder Changes from review Signed-off-by: Francisco Herrera <fjglira@gmail.com>

istio-testing added the size/S label Apr 23, 2026

fjglira requested review from FilipB and Copilot April 23, 2026 19:15

Copilot started reviewing on behalf of fjglira April 23, 2026 19:16 View session

Copilot AI reviewed Apr 23, 2026

View reviewed changes

FilipB requested a review from Copilot April 24, 2026 11:33

Copilot started reviewing on behalf of FilipB April 24, 2026 11:34 View session

Copilot AI reviewed Apr 24, 2026

View reviewed changes

FilipB approved these changes Apr 24, 2026

View reviewed changes

istio-testing merged commit ca09f5f into istio-ecosystem:main Apr 24, 2026
25 checks passed

This was referenced Apr 24, 2026

[release-1.27] test: Modify await_operator to dinamically get deployment name from csv when OLM is true #1877

Merged

[release-1.28] test: Modify await_operator to dinamically get deployment name from csv when OLM is true #1878

Merged

istio-testing mentioned this pull request Apr 24, 2026

[release-1.29] test: Modify await_operator to dinamically get deployment name from csv when OLM is true #1879

Merged

istio-testing mentioned this pull request Apr 24, 2026

[release-1.0] test: Modify await_operator to dinamically get deployment name from csv when OLM is true #1880

Open

istio-testing mentioned this pull request Apr 24, 2026

[release-1.26] test: Modify await_operator to dinamically get deployment name from csv when OLM is true #1881

Merged

fjglira mentioned this pull request May 8, 2026

[release-1.30] Set DEPLOYMENT_NAME to csv name when OLM is true #1925

Merged

1 task

Conversation

fjglira commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Additional information:

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov Bot commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

FilipB left a comment

Choose a reason for hiding this comment

Uh oh!

fjglira commented Apr 23, 2026

Uh oh!

fjglira commented Apr 23, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

istio-testing commented Apr 24, 2026

Uh oh!

istio-testing commented Apr 24, 2026

Uh oh!

istio-testing commented Apr 24, 2026

Uh oh!

istio-testing commented Apr 24, 2026

Uh oh!

istio-testing commented Apr 24, 2026

Uh oh!

istio-testing commented Apr 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

fjglira commented Apr 23, 2026 •

edited

Loading

codecov Bot commented Apr 23, 2026 •

edited

Loading